From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 4 Jun 2009 09:41:50 +0000 (+0100)
Subject: xm: xen-api, pass-through: create: Use vslot for hotplug_slot
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13805
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=54ceba35a1fdf2326e407c4e41b76ee5abd93fa3;p=xen.git

xm: xen-api, pass-through: create: Use vslot for hotplug_slot

Using func for hotplug_slot is not correct, although func is often
zero, previously zero meant please pick a vslot and asking xend to
pick a vslot was the only method available.

This resolves the following error when using Xen API:
$ xm create hvm.conf
...
Internal error: Timed out waiting for device model action.

Signed-off-by: Simon Horman <horms@verge.net.au>
---

diff --git a/tools/python/xen/xm/xenapi_create.py b/tools/python/xen/xm/xenapi_create.py
index ae9c0326cd..54e0cd665f 100644
--- a/tools/python/xen/xm/xenapi_create.py
+++ b/tools/python/xen/xm/xenapi_create.py
@@ -539,7 +539,7 @@ class xenapi_create:
             "PPCI":
                 target_ref,
             "hotplug_slot":
-                int(pci.attributes["func"].value, 16),
+                int(pci.attributes["vslot"].value, 16),
             "options":
                 get_child_nodes_as_dict(pci,
                   "pci_opt", "key", "value")